Provide an API to interact with CalDav server #1465

HoussemNasri · 2025-01-15T13:13:28Z

Closes #1462

TODO:

Use the If-Match header not to update calendar objects that changed since they have been retrieved.

tmail-backend/tmail-third-party/openpaas/pom.xml

tmail-backend/apps/memory/src/main/java/com/linagora/tmail/james/app/MemoryServer.java

...end/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/card/CardDavHandler.java

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java

...y/openpaas/src/main/java/com/linagora/tmail/dav/request/GetCalendarByEventIdRequestBody.java

...ackend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/xml/CalendarData.java

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java

...il-third-party/openpaas/src/main/java/com/linagora/tmail/configuration/DavConfiguration.java

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java

HoussemNasri · 2025-01-22T13:45:49Z

Note: For some reason, I had to force push. Anyway, the only new commit is c448e55.

tmail-backend/tmail-third-party/openpaas/pom.xml

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java

...kend/tmail-third-party/openpaas/src/test/java/com/linagora/tmail/dav/DavServerExtension.java

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java

chibenwa · 2025-01-24T15:29:56Z

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java

+                    .switchIfEmpty(Mono.fromRunnable(
+                        () -> LOGGER.trace("VEvent '{}' was not found in Calendar '{}'.", eventUid, calendarURI)))


ReactorUtils.logAsMono in order to be more idiomatic.

I couldn't because logAsMono is not generic. It returns Mono<Void> while we need Mono<Calendar>.

ReactorUtils.logAsMono(() -> LOGGER...).thenReturn(calendar) ???

But then we need to thenReturn(null). In my opinion, unless we make logAsMono generic, this is the best syntax we can achieve.

https://projectreactor.io/docs/core/release/api/reactor/util/context/Context.html

Yes but it looses context. So please comply.

Okay, done. Should we open a PR in James to make logAsMono generic?

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java

chibenwa · 2025-01-24T15:36:18Z

An alternative solution is we use this fork https://github.com/nmondal/spark-11/blob/master/pom.xml

To be adopted at the James scale if needed. Feel free to post an email about this onto [email protected].

chibenwa · 2025-01-27T13:21:10Z

@HoussemNasri you need to rebase in order to solve conflict

chibenwa · 2025-01-27T16:35:47Z

Use the If-Match header not to update calendar objects that changed since they have been retrieved.

Basic rule when doing optimistic transactions:

This will need to be retried.

THe total number of retries need to be bounded and low: 5 max....

chibenwa · 2025-01-27T20:43:35Z

Reviewed.

There is still a merge conflict over here!

chibenwa · 2025-01-28T12:03:43Z

Can we write a clean history here with ISSUE-XXX as a commit message prefix?

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java

...kend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClientException.java

chibenwa · 2025-01-29T14:13:00Z

tmail-backend/tmail-third-party/openpaas/pom.xml

+        <dependency>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
+            <version>3.10.0</version>


Forgotten <scope>test</scope>

Just to summarize the current issue with dependencies:

Wiremock imports a library called json-schema-validator.

This library is being imported by mockserver too but uses an old and uncompatible version.

At class-load time, this library reads a localization JSON file, parses it, and caches the object in memory.

This file is not stored under a package name but rather stored in the root of the resources folder.

This creates a conflict between the two localization files imported by Wiremock and Mockserver and one would override the other.

As the versions of the library imported are incompatible, using the code of version A to read the config of version B fails.

The two versions can co-exist because the wiremock library is imported as standalone: https://github.com/wiremock/wiremock/blob/f91326573547a90fd143252d77961eaa0345dbb1/build.gradle#L284

Ok shading dependencies is really OK in this context.

tmail-backend/jmap/extensions-api/pom.xml

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java

Arsnael · 2025-02-03T04:42:30Z

[ERROR] Crashed tests:
[ERROR] com.linagora.tmail.james.app.MemoryServerWithOpenPaasConfiguredTest$DavConfigured

vttranlina · 2025-02-10T04:27:06Z

We've updated ical4j to version 4.1.0 in tmail-backend

cecccc2

chibenwa · 2025-02-10T12:45:37Z

Can we rebase this @HoussemNasri ? And also fix the build...

chibenwa · 2025-02-10T16:29:18Z

tmail-backend/apps/distributed/pom.xml

+            <artifactId>wiremock-standalone</artifactId>
+            <version>3.10.0</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
            <groupId>org.mock-server</groupId>


Which tests uses mock-server in this module?

… operations - Implemented parsing of DAV multistatus responses - Implemented user calendar discovery via PROPFIND requests - Added WireMock for testing PROPFIND and REPORT methods as mockserver does not support custom HTTP methods.

- Because we use a mock server

Remove uncalled constructors in Dav exceptions Remove unneeded dependency Polish DavClient - Line break management - Avoid a bit code duplication - Use specialized UnaryOperator - static and final where possible Fix wiremock tests Drop unused test method Simplify DavServerExtension Drop mockserver Fix broken tests after dropping mockserver tmail-openpaas: Drop scala as it is no longer needed Remove mockserver from third-party/openpaas maven module Because it clashes with wiremock, which is needed for custom HTTP methods. Dependency clash will not be manageable on the long run. Co-authored-by: Benoit Tellier <[email protected]>

chibenwa reviewed Jan 15, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/pom.xml Outdated Show resolved Hide resolved

chibenwa reviewed Jan 15, 2025

View reviewed changes

tmail-backend/apps/memory/src/main/java/com/linagora/tmail/james/app/MemoryServer.java Show resolved Hide resolved

chibenwa reviewed Jan 15, 2025

View reviewed changes

...end/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/card/CardDavHandler.java Outdated Show resolved Hide resolved

HoussemNasri force-pushed the refactor-dav-client branch from 5dc96d3 to 0df173e Compare January 20, 2025 11:37

chibenwa reviewed Jan 20, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java Outdated Show resolved Hide resolved

chibenwa reviewed Jan 20, 2025

View reviewed changes

chibenwa reviewed Jan 21, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java Outdated Show resolved Hide resolved

chibenwa reviewed Jan 21, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java Outdated Show resolved Hide resolved

HoussemNasri force-pushed the refactor-dav-client branch from 7c99cbe to c448e55 Compare January 22, 2025 13:43

chibenwa reviewed Jan 22, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/pom.xml Outdated Show resolved Hide resolved

chibenwa reviewed Jan 22, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java Outdated Show resolved Hide resolved

chibenwa reviewed Jan 22, 2025

View reviewed changes

...kend/tmail-third-party/openpaas/src/test/java/com/linagora/tmail/dav/DavServerExtension.java Outdated Show resolved Hide resolved

HoussemNasri marked this pull request as ready for review January 24, 2025 13:24

chibenwa reviewed Jan 24, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java Outdated Show resolved Hide resolved

chibenwa reviewed Jan 24, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java Outdated Show resolved Hide resolved

HoussemNasri force-pushed the refactor-dav-client branch from b70ba7e to a0ab5f9 Compare January 28, 2025 09:42

chibenwa reviewed Jan 28, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java Outdated Show resolved Hide resolved

chibenwa reviewed Jan 28, 2025

View reviewed changes

...kend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClientException.java Outdated Show resolved Hide resolved

HoussemNasri force-pushed the refactor-dav-client branch from f21f149 to ced7adc Compare January 29, 2025 11:11

chibenwa reviewed Jan 29, 2025

View reviewed changes

tmail-backend/jmap/extensions-api/pom.xml Outdated Show resolved Hide resolved

chibenwa reviewed Jan 29, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java Outdated Show resolved Hide resolved

chibenwa reviewed Jan 29, 2025

View reviewed changes

tmail-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/dav/DavClient.java Outdated Show resolved Hide resolved

HoussemNasri force-pushed the refactor-dav-client branch from 2e6d0d6 to aecb7f9 Compare February 10, 2025 16:12

chibenwa reviewed Feb 10, 2025

View reviewed changes

HoussemNasri and others added 13 commits February 11, 2025 10:08

[ISSUE-1462] Test CalDav specific API methods

05039be

[ISSUE-1462] Escape XML characters to avoid security vulnerability

dd6c433

[ISSUE-1462] Introduce DavClient#updateCalendarObject

a1f5d01

[ISSUE-1462] Remove dependency on jmap-extensions

bb93191

[ISSUE-1462] Rename 'CardDav' to 'Dav' when needed

866d46e

[ISSUE-1462] Retry calendar object update on server PRECONDITION_FAILED

4fac1b2

[ISSUE-1462] Use low retry-backoff value when running tests

ef41cdf

- Because we use a mock server

[ISSUE-1462] Protect against XML external entity attacks

dade287

[ISSUE-1462] Be more resilient against invalid use calendars

1a724aa

[ISSUE-1462] Identify user calendar collections based on d:resourcetype

361657d

[ISSUE-1462] Use logAsMono to not lose reactive context

e96e8a6

HoussemNasri force-pushed the refactor-dav-client branch from a8676bd to 3735d13 Compare February 11, 2025 09:09

chibenwa merged commit 7bd97c7 into linagora:master Feb 11, 2025
5 checks passed

		.switchIfEmpty(Mono.fromRunnable(
		() -> LOGGER.trace("VEvent '{}' was not found in Calendar '{}'.", eventUid, calendarURI)))

Provide an API to interact with CalDav server #1465

Provide an API to interact with CalDav server #1465

Uh oh!

Conversation

HoussemNasri commented Jan 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

TODO:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

HoussemNasri commented Jan 22, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

HoussemNasri Jan 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

chibenwa commented Jan 24, 2025

Uh oh!

chibenwa commented Jan 27, 2025

Uh oh!

chibenwa commented Jan 27, 2025

Uh oh!

chibenwa commented Jan 27, 2025

Uh oh!

chibenwa commented Jan 28, 2025

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Arsnael commented Feb 3, 2025

Uh oh!

vttranlina commented Feb 10, 2025

Uh oh!

chibenwa commented Feb 10, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

HoussemNasri commented Jan 15, 2025 •

edited

Loading

HoussemNasri Jan 27, 2025 •

edited

Loading